ci: Updates for centos builds

- Do the modern way to enable the buildroot with crb and epel

Signed-off-by: Colin Walters <walters@verbum.org>

diff --git a/ci/installdeps.sh b/ci/installdeps.sh
index d71240e5e649e8f87a4715f5af0ee48adecd35c4..bb8a93b47985b7b8011b384bc51bcf22d727d32b 100755 (executable)
--- a/ci/installdeps.sh
+++ b/ci/installdeps.sh
@@ -16,6 +16,7 @@ dn=$(dirname $0)
 
 pkg_upgrade
 pkg_install_buildroot
+pkg_install ccache
 pkg_builddep ostree
 # Not yet in the spec
 pkg_install composefs-devel
@@ -27,7 +28,3 @@ if test -n "${CI_PKGS:-}"; then
 fi
 pkg_install_if_os fedora gjs gnome-desktop-testing parallel coccinelle clang \
                   python3-PyYAML
-if test "${OS_ID}" = "centos"; then
-    rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-    pkg_install python34{,-PyYAML}
-fi

diff --git a/ci/libbuild.sh b/ci/libbuild.sh
index d9b985290e86b390602a0ad5289008805f1146c7..def327af9d1e843077b2c250be1af53d9d2900be 100644 (file)
--- a/ci/libbuild.sh
+++ b/ci/libbuild.sh
@@ -40,6 +40,9 @@ pkg_install_buildroot() {
             pkg_install dnf-plugins-core @buildsys-build;;
         centos)
             # Sadly this stuff is actually hardcoded in *Python code* in mock...
+            dnf -y install dnf-utils
+            dnf config-manager --enable crb
+            dnf -y install https://dl.fedoraproject.org/pub/epel/epel{,-next}-release-latest-9.noarch.rpm
             dnf -y install make gcc;;
         *) fatal "pkg_install_buildroot(): Unhandled OS ${OS_ID}";;
     esac